Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

the hoppening 2: lets hop to it #799

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

cornercube
Copy link
Contributor

About The Pull Request

had to close the last PR due to constant merge issues
re-opens it

Why It's Good For The Game

more alcohol = good

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

@ThePainkiller
Copy link
Contributor

I still think you haven't understood that, realistically speaking Ale is a type of beer and not the other way around........

@NPC1314 NPC1314 added the Merge conflict This PR won't compile due to merge conflics label Sep 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Merge conflict This PR won't compile due to merge conflics
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants